From 367fd4b89a9a691b27d1f8c67ea6a66cdf783656 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 22 Dec 2016 16:26:59 +0000 Subject: [PATCH] changelog: document fix cherry pick Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ debian/control.md5sum | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e12c1c2ee4..7e4096b3e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,9 @@ xen (4.8.0-1~) unstable; urgency=high * Change my own email address to my work (Citrix) address. When uploading, I will swap hats to effectively sponsor my own upload. + * Cherry pick a build failure fix: + "x86/emul: add likely()/unlikely() to test harness" + [ Ian Campbell ] * Start a qemu process in dom0 to service the toolstacks loopback disk attaches. (Closes: #770456) diff --git a/debian/control.md5sum b/debian/control.md5sum index d30740a33b..1bb5c69fbb 100644 --- a/debian/control.md5sum +++ b/debian/control.md5sum @@ -1,4 +1,4 @@ -12b01f357e9d4311d12ac9e6ec28c42f debian/changelog +7ee2f2461f92ce180c488b8c2294bc76 debian/changelog dc7b5d9f0538e3180af4e9aff9b0bd57 debian/bin/gencontrol.py 20e336dbea44b1641802eff0dde9569b debian/templates/control.main.in a15fa64ce6deead28d33c1581b14dba7 debian/templates/xen-hypervisor.postinst.in -- 2.30.2